{crucible,crux}-llvm: Adapt to elliottt/llvm-pretty#118
#1162
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RyanGlScott
commented
Jan 10, 2024
| @@ -133,8 +134,7 @@ makeGlobalMap ctx m = foldl' addAliases globalMap (Map.toList (llvmGlobalAliases | |||
| ++ ": " | |||
| ++ err) | |||
| where showSymbol sym = | |||
| show $ let ?config = LPP.Config False False False | |||
| in LPP.ppSymbol $ sym | |||
| show $ ppLLVMLatest $ LPP.ppSymbol $ sym | |||
There was a problem hiding this comment.
I opted to change the Config used here for consistency's sake. The ppSymbol function doesn't make use of any Config-specific options anyway.
langston-barrett
approved these changes
Jan 10, 2024
This patch: * Bumps the `llvm-pretty` and `llvm-pretty-bc-parser` submodules to recent commits that include the changes from GaloisInc/llvm-pretty#118. * Introduces a `ppLLVMLatest` combinator to `Lang.Crucible.LLVM.PrettyPrint` that prints a `Fmt` value (from `Text.LLVM.PP`) using the latest version of LLVM that `llvm-pretty` supports. * Uses `ppLLVMLatest` in the appropriate places to fix compilation errors. Fixes #1145.
RyanGlScott
force-pushed
the
T1145-bump-llvm-pretty
branch
from
1038a36 to
4739fe7
Compare
kquick
approved these changes
Jan 10, 2024
RyanGlScott
added a commit
that referenced
this pull request
Feb 1, 2024
RyanGlScott
added a commit
that referenced
this pull request
Feb 1, 2024
RyanGlScott
added a commit
that referenced
this pull request
Feb 5, 2024
RyanGlScott
added a commit
that referenced
this pull request
Feb 5, 2024
RyanGlScott
added a commit
that referenced
this pull request
Feb 5, 2024
RyanGlScott
added a commit
that referenced
this pull request
Feb 6, 2024
(cherry picked from commit 6f940c1)
RyanGlScott
added a commit
that referenced
this pull request
Feb 6, 2024
(cherry picked from commit d8fba04)
RyanGlScott
added a commit
that referenced
this pull request
Feb 6, 2024
(cherry picked from commit d8fba04)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch:
llvm-prettyandllvm-pretty-bc-parsersubmodules to recent commits that include the changes from Use Fmt encapsulation and add LLVMPretty class llvm-pretty#118.ppLLVMLatestcombinator toLang.Crucible.LLVM.PrettyPrintthat prints aFmtvalue (fromText.LLVM.PP) using the latest version of LLVM thatllvm-prettysupports.ppLLVMLatestin the appropriate places to fix compilation errors.Fixes #1145.